Skip to content

Fix branch pulls for detached primary workspaces#696

Merged
chubes4 merged 1 commit into
mainfrom
fix-detached-primary-pull-20260613
Jun 14, 2026
Merged

Fix branch pulls for detached primary workspaces#696
chubes4 merged 1 commit into
mainfrom
fix-detached-primary-pull-20260613

Conversation

@chubes4

@chubes4 chubes4 commented Jun 14, 2026

Copy link
Copy Markdown
Member

Summary

  • pass pull remote/branch options through the workspace git CLI and ability
  • run explicit git pull --ff-only <remote> <branch> when a branch is supplied
  • preserve existing pull behavior when no branch is provided

Testing

  • php -l inc/Workspace/WorkspaceGitOperations.php
  • php -l inc/Abilities/WorkspaceAbilities.php
  • php -l inc/Cli/Commands/WorkspaceCommand.php
  • git diff --check

AI assistance

  • AI assistance: Yes
  • Tool(s): OpenCode (openai/gpt-5.5)
  • Used for: Diagnosed the detached-primary pull failure, drafted the code change and validation commands for Chris to review.

@homeboy-ci

homeboy-ci Bot commented Jun 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Homeboy Results — data-machine-code

Lint

✅ lint — passed

ℹ️ Full options: homeboy docs commands/lint
ℹ️ Save lint baseline: homeboy lint data-machine-code --baseline
Deep dive: homeboy lint data-machine-code --changed-since 0ab1d86

Artifacts and drill-down
  • CI results artifact: homeboy-ci-results-data-machine-code-lint-quality-Linux-node24 contains immediate command JSON for this action invocation.
  • Observation artifact: homeboy-observations-data-machine-code-lint-quality-Linux-node24 contains exported Homeboy run history for deeper queries.
  • Drill-down: download the observation artifact, then run homeboy runs import <dir>, homeboy runs list, and homeboy runs findings <run-id>.
  • Artifacts are attached to the workflow run: https://github.com/Extra-Chill/data-machine-code/actions/runs/27483452978

Test

✅ test — passed

ℹ️ Auto-fix lint issues: homeboy refactor data-machine-code --from lint --write
ℹ️ Collect coverage: homeboy test data-machine-code --coverage
ℹ️ Save test baseline: homeboy test data-machine-code --baseline
ℹ️ Pass args to test runner: homeboy test -- [args]
ℹ️ Full options: homeboy docs commands/test
Deep dive: homeboy test data-machine-code --changed-since 0ab1d86

Artifacts and drill-down
  • CI results artifact: homeboy-ci-results-data-machine-code-test-quality-Linux-node24 contains immediate command JSON for this action invocation.
  • Observation artifact: homeboy-observations-data-machine-code-test-quality-Linux-node24 contains exported Homeboy run history for deeper queries.
  • Drill-down: download the observation artifact, then run homeboy runs import <dir>, homeboy runs list, and homeboy runs findings <run-id>.
  • Artifacts are attached to the workflow run: https://github.com/Extra-Chill/data-machine-code/actions/runs/27483452978

Audit

✅ audit — passed

  • audit — 31 finding(s)
  • Total: 31 finding(s)

Deep dive: homeboy audit data-machine-code --changed-since 0ab1d86

Artifacts and drill-down
  • CI results artifact: homeboy-ci-results-data-machine-code-audit-quality-Linux-node24 contains immediate command JSON for this action invocation.
  • Observation artifact: homeboy-observations-data-machine-code-audit-quality-Linux-node24 contains exported Homeboy run history for deeper queries.
  • Drill-down: download the observation artifact, then run homeboy runs import <dir>, homeboy runs list, and homeboy runs findings <run-id>.
  • Artifacts are attached to the workflow run: https://github.com/Extra-Chill/data-machine-code/actions/runs/27483452978
Tooling versions
  • Homeboy CLI: homeboy 0.229.3+a534d2f
  • Extension: wordpress from https://github.com/Extra-Chill/homeboy-extensions
  • Extension revision: aa56904c
  • Action: unknown@unknown

@chubes4 chubes4 merged commit 1c92bf8 into main Jun 14, 2026
5 checks passed
@chubes4 chubes4 deleted the fix-detached-primary-pull-20260613 branch June 14, 2026 01:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@chubes4